Upgrading Godzilla